Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Mar 2012 06:33:44 +0000 (22:33 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Mar 2012 06:33:44 +0000 (22:33 -0800)

Trivial merge